Merging ub-launcher3-qt-dev, build 5697268
am: a0967d21e6

Change-Id: I210e1791caf6fed322b2aeda1036b4b903916adc