Merge "Ensure that SOFT_DENIED doesn't result in a call to finishOp" into sc-dev