Merge "Fix issue with force resizing activity when app level doesn't want to" into oc-dev