Merge "Fix some config issues with sysui" into oc-dr1-dev