Merge "Add two more enums to LauncherState" into rvc-dev