Merge "Add general grouping title into accessibility settings" into sc-dev