Merging ub-launcher3-qt-r1-dev, build 5781802
am: 45d5cd2c30

Change-Id: Iecab4e7cbced3357cd095d9a4eaa39e21594f38d