Merge "Apply top intro preference in Settings app (1/n)"