Merge "Fix NPE in LegacyGlobalActions" into rvc-dev