Merge "Rebind to ControlsProviderService if package updates" into udc-dev