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