Merge "GenericSource: Allow multiple buffer reads for video" into nyc-mr1-dev