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

Change-Id: I85dd1243913d6156a6aed0780335f14ede912582