Merging  ub-launcher3-qt-dev, build 5656472 am: 0e57817adc
am: ae81279a02

Change-Id: Ib29494164f57d0ffb52ae58ff07e90de19a8632d