Merge "Drive-by fix for wtfIfInLock + two violations" into sc-dev