Merge "Fix enterAlways|enterAlwaysCollapsed with window insets" into nyc-dev
am: 3df4cf603e

* commit '3df4cf603eca5ec248dbbe26bdfaaa28f1bd97c9':
  Fix enterAlways|enterAlwaysCollapsed with window insets

Change-Id: I2b9c2571f5e5ca56de54de155f6a3500b1cc1934