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