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

Change-Id: Ie007a26d4d0264f5a0609cbc0996a5a509734382