Merge "Separate BubblesController construction from initialization" into sc-dev