Merge "Workaround for ignored resizeableActivity param" into nyc-dev