Merge "SF: Don't override active mode with desired mode" into sc-dev