Merge "Revert to enabling the register/unregister APIs based on the feature flag, as opposed to always enabling them." into udc-qpr-dev