Merge "Fix issue with media notifs being misbucketed" into qt-dev
am: 16e2397de5

Change-Id: Id3b3c4c60fd09122ee5a5cf3eb53b986a7061ba2