Merge "Merge \\"Fix layout issue after insets changed\\" into nyc-dev am: 119f1715 am: c43c9e05" into nyc-mr1-dev-plus-aosp