Merge "Listen to capability discovery settings in the registry" into rvc-dev am: 3f315ed7d2

Change-Id: I3ba0d90e500d4fb9ed36ba7b012a8f2d92a0b6c6