Merge "Lets use the same resId as floating bubbles, works better with tests" into main