Merge "Merge \"Notify user when application does not support current display zoom\" into nyc-mr1-dev am: 1a91866400" into nyc-mr1-dev-plus-aosp