Merge "SF: change active config when 90Hz flag is on."