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

Change-Id: If74a1846f17735413fd5c84a4e8832d5da277c4d