Trying to shore up Android aspect ratio edge case