Merge "MediaPlayerService: allow next player to be NULL" into nyc-dr1-dev