More preference and config fixes

Change-Id: If19531c3c0f58a271bbaab11e10a987d2fa0224f
Merge "More preference and config fixes"