Merge "Global scale must always be updated when size compat scale is changed" into main