Merge "Reconcile difference btw master and ub-launcher3-master" into ub-launcher3-master