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

Change-Id: Id1cfe706a19d898bba4a9e3e651a5e7420df2b6c