Merge "Update settings wording for ICS"