Merge "Simplify legacy screen compat mode a bit" into main