Merge "Correct animation glitch for pinned stack." into oc-dev