Merging ub-launcher3-qt-r1-dev, build 5622904
am: 889619eab9

Change-Id: Id26612b12fd1fbba07cf498ed44f37858e7cd44b