Merge "Add the MediaPlayerList and fix some checks"