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