Merge "Revert changes to force layout after insets changes" into nyc-mr1-dev