Merge "Temporary disable flaky test." into rvc-dev