Merge "Fix CoordinatorLayout IllegalArgumentException crash" into nyc-mr1-dev