Merge "Revert "Use resolved bounds in CompatDisplayInsets if letterboxed for aspect ratio"" into 24D1-dev