This fixes a bug where the phone thumbnail scale was being miscalculated for the square aspect of thumbnails on phones. The code now constrains thumbnails to fit the smaller of screen width and screen height. Change-Id: I174abacd4cf3dcf124e10fe8980fb01fe299ec6a