Merge "Increase WAIT_RA_TIMEOUT_MS" into main