Merge "Skip Compat UI when in desktop mode" into main