am a1fb3950: Merge change 5394 into donut

Merge commit 'a1fb3950cf46f61800d2ca41d2020037d6b2307e'

* commit 'a1fb3950cf46f61800d2ca41d2020037d6b2307e':
  Fixes #1940605. RelativeLayout was swapping horizontal and vertical