Merge "Update bubble user education screens to use proper colors" into sc-dev