Merge "Moving HelpUtils to SettingsLib" into nyc-dev