Merge "TimeCheck: Allow property to change the timecheck timeouts." into main