Merge "SF: Enforce thread safety of active mode access"