Merging ub-launcher3-qt-r1-dev, build 5749827
am: 3fc9a1cf69

Change-Id: Ia73d517059270c0a5b089413c2b0aae7b1cbcb43