Merge "Merge "Don't use Primary sensor when Secondary available." into sc-dev am: 00f16a79" into sc-v2-dev