Merge "Changed text controls to re-apply style after system font size change" into...