Merge "Correct animation glitch for pinned stack." into oc-dev
am: 99b72250c2

Change-Id: I63652fee54ab90ae855b4a61b745c087f332fb05