Merge "NuPlayer: queue a deferred scan sources when flushing during scan"