Merge change I611cd3f4

* changes:
  Fixes layout shifts in LinearLayout.