Merge "Fix bubble showing after dismiss bug."