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