Merging ub-launcher3-qt-dev, build 5633311
am: a3ed49d566

Change-Id: I502b6cfa5e9eb405cda4d51173bab3b3e3d7220c