Merge "Refactor MediaPlayerBase's notify" into oc-dev