Merge "Properly update remote service when ContentSuggestionsPerUserService is updated."