Merge "Merge "Fix some config issues with sysui" into oc-dr1-dev am: f636e3fb" into oc-dr1-dev-plus-aosp