Merge "Correct potential deadlock in AnrTimerService" into main