Merging ub-launcher3-qt-dev, build 5456758
am: cec2df62b2

Change-Id: I349da99bbd5daef75c84c81b635c837d2fef346f