Merge "Prevent multiple outstanding permission queries per client" into sc-qpr1-dev