Merge "AccountManager: Update display name only if it is not null." into stable-2.11