Merge "GenericSource: restore mLock state in error cases"