Merge "SF: Requery display modes if the active mode is not supported" into sc-dev