Merge "Let NoMan know when something is no longer a bubble" into qt-dev am: aebf984d90
am: 7acc3301e6

Change-Id: I3e74c363060533ef9a5264aada3bbcfb72c31138