Merge "Fix NullPointerException in MediaPlayer"