Merge "Fix tests in UserDetailsSettingsTest and TimeoutToDockUserPreferenceControllerTest" into main