am c78d173b: am 68411471: Merge "Fix layout rendering for RTL locales" into jb-mr2-dev

* commit 'c78d173b730dcfdf107e6ac2bc959d459fe3eedd':
  Fix layout rendering for RTL locales