Merge \"Merge \\\"Fix layout issue after insets changed\\\" into nyc-dev am: 119f1715b3 am: c43c9e052e\" into nyc-mr1-dev-plus-aosp
am: a7bc56a4d9

Change-Id: I4c90dc74984fb817a1796935a60c1dd2c97c0fa7