settings: Fix loading of some initial values

Change-Id: I41658dd8dc3f31b4463ae4d4f3cd6f480a0ccba3
(cherry picked from commit 8f754f516eb15179095b0e98091107d1dce47138)