Merge \"Notify user when application does not support current display zoom\" into nyc-dev
am: c577a50d09  -s ours

Change-Id: I1d43ee5ecd627edd952979e300253de3c49f2218