Merge "MediaPlayerList: Prevent NPE in wrapper.cleanup()"