am 9a1f13a4: am afc623e3: am bd9e181b: Fix layout rendering for RTL locales [DO NOT MERGE]

* commit '9a1f13a47bfe29e344efc05f0ecabbfcb5671e06':
  Fix layout rendering for RTL locales [DO NOT MERGE]