Merge "MediaSession: clear identity before accessing service methods" into oc-dev