Merge "Merge "Fix transition for forced resizable exit" into nyc-dev am: 6cb8a2cfd2 am: b1ed1f6b3d" into nyc-mr1-dev-plus-aosp