Merge "Set current state key earlier and do not reset hasCurrentState" into rvc-dev