Merge \\"Apply animation in relayout invisible the old way\\" into nyc-mr1-dev am: 8f54d32b99
am: 8ca3333d90

Change-Id: Iaa6f622142eab1454d5bd769a532f010d4509078