Fix animation glitch with overlapping orientation changes. am: 42769fff6f
am: f7f12caa73

Change-Id: I708dfaf3186798615222a83c8e61fea609c150e0