Merge "Merge "Fix app bounds for pinned stack" into oc-dev am: 4116913e3a" into oc-dev-plus-aosp