Merge "Update QuickControls Typography" into main