This is related with 6840816.

If 6840816 is fixed by deployment team, then this CR will be closed. Another CR will be filed to track the l10n of deployment team adjustment in layout.

if 6840816 would not be fixed in 6u16, then we would adjust layout in some locales, to make them better based on current design from deployment team. This will take time but can make the layout better.

Current layout is acceptable, but not good in some locales. We can make it better, but the best way and first choice is stll to let deployment team fix 6840816.