58530bd64b
Also avoiding settings cache reset whenever someone registers a new listener Bug: 184200027 Test: Manual Change-Id: I0c8b7084b6b4656102e9041b779b80a98624ddd8