Merge "Fix some config issues with sysui" into oc-dr1-dev am: f636e3fb52
am: f6219fa804

Change-Id: I664f79cf1b63edb083773b3cd283fec4d0a5e9bb