Merge "Fix issue with media notifs being misbucketed" into qt-dev