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

Change-Id: Id4ac8dd58f2c7dd03c479af5a7c5a2dcf54b0ce3