Merge \\\"Notify user when application does not support current display...
Merge \\\"Notify user when application does not support current display zoom\\\" into nyc-dev am: c577a50d -s ours am: 04e58554 -s ours
am: e306fbff
Change-Id: I63e7c04d07885aff949568e548a67d537fe9e29a