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

Change-Id: I64f8d672a2cf4316e379dd34b30ca349c2715b9c