Merge "Allow clients to register for listening to changes in capabilities." into sc-dev