Merge "More targeted version of "Correct animation glitch for pinned stack."" into oc-dev am: d00cb1c48a
am: 79c3ca4d7b

Change-Id: I2c37db42a6e1965fbd15eef6ebce8f00f4c784e2