Merging ub-launcher3-qt-r1-dev, build 5736932
am: 5841e40a95

Change-Id: Icd0e789912b0198e884a9c1cd222a134a380cf67