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