Merge "Fix sensitive labels for font size settings." into nyc-dev