Merge "Alignment tweaks in contact editor"