Merge "Fix an issue where the bubble wasn't opening" into sc-dev