Merge "Update settings icon in bubbles user education" into main