Merge "Fix up bubble actions"