This change also cleanups preference key string constants

Change-Id: I58510f220a90d00d71a935731abeab87384675bb