Merge "Hide extra empty kind editor on compact contact editor"