Merging ub-launcher3-qt-r1-dev, build 5759495
am: 77db8d0669

Change-Id: I6d295215a63119c1d8ac8f939776d809efc0474c