Fix some SharedPreferences issues

In I7b11bd0d17e6cc184b67c8c943531146fc964b49 and
I06330423736835af397e3dbd000ecdcf33c14eef, I caused some prefs to
sometimes use a file with the wrong name. This should fix that.

Change-Id: I417805029e489c96dd0671d64ec825383a473b0b
3 files changed