Merge "Make ContactPreferences use SharedPreferences instead of System settings (2/5)" into lmp-dev