Merging  ub-launcher3-qt-dev, build 5619253 am: 0ef6fe00b0 am: 0f14ab6e65
am: 631d3f15b4

Change-Id: Ic31c33928ff16e9677cd171ae431f8bc5bd6f59e