Merge "Adjust the X icon in selection bar for alignment." into ub-contactsdialer-f-dev