Merging ub-launcher3-qt-dev, build 5662436 am: 1461f48ef2 am: f85b573d07
am: 02666a257d

Change-Id: If0b2bacf8ec858d3bbc4dbb72fb80a6d7734df1e