Merge "Do not show overflow after the last bubble dismissed (in master)."