Merge "Revert "Address AnrTimer review comments"" into main