Merge "Fix tests in TimeoutToDockUserPreferenceControllerTest" into main