Merge "GenericSource: fix error handling during preparing or rebuffering"