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

* commit '514e08249aec11859633a748539235bbe42b576d':
  Add usage of app:behavior_skipCollapsed

Change-Id: Ia38b3a7f2f70db5607f5fbe576d86a362e9f8f6c