Reconcile difference btw master and ub-launcher3-master

Change-Id: I33dcd6a062b754edbe2da9c7fcf2a8ccfb41b661
2 files changed