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