Merge "Account header icon cut off in contact editor for local contacts"