Merge "MediaSession2: Code cleanup for setPlayer"