Merge "Fix size compat bounds in close-to-square display" into rvc-dev