Fix #5204 - Inconsistent Layout Lint Warning #10029

Job	Run time
Compute affected tests	2m 59s
Run Bazel Test (app-shard0;H4sIAAAAAAAAAK2UQW/bMAyFD7v12D/Ce29Z0ADFsjZr0nXtjZUYm6siChSTzPv1leMGmd...	33m 36s
Run Bazel Test (app-shard1;H4sIAAAAAAAAAJ2TwVIbMQyGD71x5EV8zy2TlCFDSjMkwEzLRXjVjYrX8shyaN6+tslO6l...	35m 31s
Run Bazel Test (app-shard2;H4sIAAAAAAAAALWTT0sDMRDFD9489ovMvQdBW/8UqtZuURFBxs10N3Y3E5KxZb+9m5SqKY...	19m 12s
Run Bazel Test (app-shard3;H4sIAAAAAAAAAJ2TPY/bMAyGh24d80e43+beB1AguQZxri3QibF4DgtZEkjGqfvrK9nIoW...	37m 52s
Run Bazel Test (app-shard4;H4sIAAAAAAAAAKWUwU4jMQyGD9z2yIv4PrdC20WiXXXZWUBckEm8M2bTceRkhu3bb5JS2k...	21m 1s
Run Bazel Test (app-shard5;H4sIAAAAAAAAAJWUT2/CMAzFD7vtyBfJvbfuD9skmMqoxKRJk0xr2mwlMU4o8O2Xpi1QpA...	19m 24s
Run Bazel Test (app-shard6;H4sIAAAAAAAAAJ2SPVPDMAyGBzZG/oj2buWjwNHS9IONO06NVSPOsYzslMu/x0lbIAs0DI...	19m 57s
Run Bazel Test (app-shard7;H4sIAAAAAAAAAKWSPU/EMAyGBzbG+yPeuxUVpBPch7gTYmEwjdUGNbHlpIX79yQ54AAJQc...	17m 26s
Run Bazel Test (app-shard8;H4sIAAAAAAAAAKWUwW7bMAyGD7vt2BfhPbd0aVFg7VrEQbthGzBGImxtsihQjJe8/SQlxu...	30m 9s
Run Bazel Test (app-shard9;H4sIAAAAAAAAAKVTTW/bMAw97LZj/wjvubnZBmTz2qAN9nkZa7EOV0kUKMZr/v0kp2nnAs...	34m 44s
Run Bazel Test (app-shard10;H4sIAAAAAAAAAKVUTW/bMAw99LZj/wjvvrkdMhRIP9N2l+3ASKzDQhY1ivHgfz/JSZBmw...	14m 47s
Run Bazel Test (generic-shard11;H4sIAAAAAAAAALWQvWpDMQyFx0LGvIj2rGkpgfSHUOhYhK0Ypb6Sa8lt6dPHvhAIp...	10m 24s
Check Bazel Test Results	1s
	4h 57m 3s

Provide feedback