Merge "Fix flaky fail of ApplicationsStateRoboTest" into rvc-dev