Merge "Bubbles styling: flyout changes" into sc-dev