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

Change-Id: Ibb056cb6d57c1f5d4c6d1946980741bbbb6bb316