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

Change-Id: I62537c464d93b49c6ca0a0c07cc6514e8a6fde7d