Merge "MediaPlayer: use local variable to check member is null." into nyc-dev