Merge "nuplayer: do not use cached source for wvm content -- DO NOT MERGE"