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

Change-Id: I5fd3997b0fde72a581aa8562a6e1a4e4e65a02bd