More preference and config fixes

Change-Id: If19531c3c0f58a271bbaab11e10a987d2fa0224f
(cherry picked from commit 85e52088e89baf142f5415b253930dfffad91c25)