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

Change-Id: Idf8e91695530c0f7d89302ab0ae7aa50a0889e49