Merge "Remove flaky annotation" into sc-v2-dev