Merge "Unregister user listener when observers are inactive" into rvc-dev am: 38b57e5d am: 5486748c Change-Id: I2003198f6a291d8229d7fe4c2ed05dc2ea360a0a