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

Change-Id: I1945dc07788603a605362fba86fca8ccff4a13be