Merge "dashplayer: Following dash changes"