Merge "Fix logical error in UID idle/active handling" into rvc-dev