Merge "Move hint strings to SettingsLib" into nyc-dev