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