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

Change-Id: Icbf9286287bfadce6a792119b0faf3aada6c8499