Merge "Fix bubble showing after dismiss bug."
am: 4db53d0cae

Change-Id: I0e3d84e038d55c531df12614f3396a967653990d