Merge "Merge "Workaround for ignored resizeableActivity param" into nyc-dev am: 005f9a73 am: ede05733" into nyc-mr1-dev-plus-aosp