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