Merge "Fix system action API issues in SystemActions" into rvc-dev