Merge "Avoid another concurrent modification exception in ShortcutHelper." into rvc-dev