Merge "Fix a bug showing the background through a punch hole when switching bubbles."