Merge "Fix issue with media notifs being misbucketed" into qt-r1-dev
am: dc860bdfa8

Change-Id: I9a239a1ea440895161cfa7e7154fb6042df2f9d6