Merge \"Show unsopported display size dialog on relaunch\" into nyc-dev
am: 354c8cde6c

Change-Id: I46f232290ebc5cf924bf696f20eb134076e83b4f