Merge "Restrict state event logging" into rvc-dev