Merge "8/ Updating bubbles to run on shell thread" into sc-dev