Merge "Playback activity monitoring: add player types" into oc-dev