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

Change-Id: Ibab788d39a4b93ef57aaffd81debd0447ffa8f9a