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

Change-Id: I89086685e4a128f67f4e7f0e3f1d0c5aa1b6a1ba