Merge "StateTracker handles active state changes" into rvc-dev