Merge "Fix noisy log from sysui flag changes" into sc-dev