Merge change 5417 into donut

* changes:
  Fixes #1943309. RelativeLayout was confused by gravities.