Merge "Don't use Primary sensor when Secondary available." into sc-dev