Merge "Synchronize before calling unstableRemoveIf" into rvc-dev