Merge "Don't query active mode after setting desired mode specs" into sc-dev