Merge change 5394 into donut

* changes:
  Fixes #1940605. RelativeLayout was swapping horizontal and vertical dependencies.