Merge "Sysui flag-related doc fixes." into klp-dev