Merging ub-launcher3-qt-r1-dev, build 5782058
am: c128131a10

Change-Id: I0f91de66acc9f6f0425d3f5da6d2c8a0b8863cca