Merge "File copy, move, if timeout, re acquire contentprovider" into rvc-dev