Merge \"Updating the search hint to contain the icon as a span object.\" into ub-launcher3-calgary
am: 9b6e6ce381

Change-Id: I2c3ae017cef88ba2e7add9d31539736ef1f1c327