Cleanup aspect ratio mess

Change-Id: Iffb2dba8720ed90cf9454b2a901a3ed13bc6bc92