Merge "Preserve non-floating state when entering pinned stack." into oc-dev
am: f5b6818009

Change-Id: I22f408fef8007cb5c1266a7115da01c07b4f0eb4