[automerger skipped] Merge "Fix issue with media notifs being misbucketed" into qt-dev am: 16e2397de5 am: cacfbf7b4b -s ours am: 6334df800e -s ours
am: 052bc766f6 -s ours
am skip reason: change_id I19223720bac534ab92219a2962169097819e8efb with SHA1 91e425d793 is in history

Change-Id: Ib285ed992654cdc7ac0c5dc71e252e379535f692