Merge "Rename IMediaSession2Callback to IMediaController2" into pi-dev