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

Change-Id: I5315a5707d0f20ba1879f7002fcf6ea54a42da72