Merge "Media notification updates" into lmp-dev