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

Change-Id: I2cc46a18a47379783de0a78b411373d30860af0c