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

Change-Id: Ie4b2397641342303742198ef50c4e21d97909aaf