Merge "Re-enable source re-scan for StreamingSource" into nyc-dev