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

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

Change-Id: If440b1562607dbd5ee4227a090fdac4af4581c9c