Merge "Fix up bubble images from experimental bubbles"