Merge "Stop measure/layout on GONE views in CoordinatorLayout" into nyc-mr1-dev am: a00197715a am: 640908fa36
am: 171d197de6

Change-Id: I122e2ac736a883cf36a8167a98ae23a9faa3a707