Merge "Merge "Unregister user listener when observers are inactive" into rvc-dev am: 38b57e5d am: 5486748c" into rvc-d1-dev-plus-aosp