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

Change-Id: Iaf2b6e209c95223ad4fe45416606b48e08418ca3