Merge "Remove SystemUIDialog subclass from FontScalingDialog" into main