Merge "Fix null pointer in StarredContactsPrefController"