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

Change-Id: I0957c82f86483312b3ff22544171890de35b9f38