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