Merge "Add client API to add/remove insets-provider." into tm-dev