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

Change-Id: I13a7214d0a1d3ee3eda994555aa0d72e3ad4702e