Merge "Revert "Align bubble behavior with DND settings."" into qt-dev am: 7c36e75d6b
am: ab26236c60

Change-Id: Ib4032dc94f1c6a9dc2a417537af306c882908b21