Merge "Fix app bounds for pinned stack" into oc-dev