Merge "Revert^2 Use resolved bounds in CompatDisplayInsets if letterboxed for aspect ratio" into main