Merge "Remove dividers of TopIntroPreference" into sc-dev