Merge origin/main into fix/ios-diff-font-scaling