Merge "Hide aspect ratio button when not visibly letterboxed" into main