Merge "Revoke the uri permission when the file is deleted" into pi-dev