Merge "Always call tieProfileLockIfNecessary() under mSpManager lock" into main