Merge "Show unsopported display size dialog on relaunch" into nyc-dev