Merge "SF: avoid updating queue if schedule() is called." into rvc-dev