Merge "MediaPlayer2Impl: fix null object reference." into pi-dev