Merge "Updates BannerMessagePreference to new style" into sc-dev