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

Change-Id: I0ffb8dfc13fa2c7a23015c1324abf1f15f981bc8