Merge "Inline "select new contact" entry in contact picker" into lmp-dev