Merge "Fix contact editor account header"