Merging ub-launcher3-qt-r1-dev, build 5724722
am: 4ebd3d4b7b

Change-Id: I56b33371f7fc98d81ac8ef4489d38fe6886f21d7