Merge "Fix NPE in MediaPlayerList"