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

Change-Id: I0b91b0d0645a43185a128f1b94ee1ea8eba2c621