Merge "Validate userId when publishing shortcuts" into rvc-dev