Merge "Fix animation glitch with overlapping orientation changes." into nyc-mr1-dev am: 2ff503b002 am: 44a71dd7f6
am: 3fb89f35a0

Change-Id: Ia587585c668a68c05ce1321317afe323bb14e067