Merge "Fix SCM app letterboxing in desktop mode" into main