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

* commit 'c321341d60b2239d1d072e408f706f52f5a8ec14':
  Fix enterAlways|enterAlwaysCollapsed with window insets

Change-Id: Iddf8260139042dddf18b8b4dfc0787f2067e3250