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

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

Change-Id: Iaf9b1fac091f46c52b017b1fd3d68ca630ab6a87