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

Change-Id: If73dd0a1f65a83af13e8621a6ae191c938b9668e