Merge "Refactor HintManagerService locking to fix race" into main