Merge \"Revert changes to force layout after insets changes\" into nyc-mr1-dev
am: 185131442b

Change-Id: I7d3eaa1d0337c0ae62ee24169b76f1938b8b9e68