Merge "Bubbles: improve how rotation is listened for" into sc-dev