Merge "Fix crash & positioning of notif-based bubbles"