Merge "Fix animation glitch with overlapping orientation changes." into nyc-mr1-dev