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

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

Change-Id: Ic9bdb582065694aeefd0642b2428f21cd54a281b