Merge "Unregister user listener when observers are inactive" into rvc-dev