Merging ub-launcher3-qt-r1-dev, build 5710902
am: d0f5db4a37

Change-Id: I662a304d15eb56b003eef598afa2dd18a4afbfdd