Merge "Playback activity monitor: fix MediaPlayer / AudioTrack reporting" into sc-dev