Merge "Register prox secondary sensor when safe." into sc-dev