Merge "Don't remove bubbless onClearAll or onNotifClick"