Merge "Merge "Revert "Align bubble behavior with DND settings."" into qt-dev am: 7c36e75d am: 1e6384d8" into qt-r1-dev-plus-aosp