am 44cc867f: (-s ours) am 9a1f13a4: am afc623e3: am bd9e181b: Fix layout rendering for RTL locales [DO NOT MERGE]

* commit '44cc867f7d4ca212b7003057148b8cdabb8f85fb':
  Fix layout rendering for RTL locales [DO NOT MERGE]