Merge "Update ShaderCache to support shared locking" into udc-qpr-dev