Merge "Add usage of app:behavior_skipCollapsed" into nyc-dev am: 514e08249a
am: 889b610439

* commit '889b6104398905ba0363a957235c6f0b1771a9c7':
  Add usage of app:behavior_skipCollapsed

Change-Id: I234966215ff87bd3a15290fe39bba66d22e16322