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

Change-Id: I3e7b3e29754424503e48ff5e059119b2469b2911