Merge "Don't auto expand the bubble when it's marked as priority" into sc-dev