Merging  ub-launcher3-qt-dev, build 5656472 am: 0e57817adc
am: 96a61f0923

Change-Id: Id93e7b85a0875001ad51129ba6eb1aad6a185976