Merge "SF: DispSync should sync to activeConfig period"