[automerger skipped] Merge "Fix issue with media notifs being misbucketed" into qt-dev am: 16e2397de5 -s ours am: 96463c8369 -s ours
am: 3e88b93c02 -s ours
am skip reason: change_id I19223720bac534ab92219a2962169097819e8efb with SHA1 8c1b763dcf is in history

Change-Id: I23c585c26690034f117dad3db5cc861337a795ca