Merge "Removing groups & ongoing from bubble ordering" into rvc-dev