Revert "Merging from ub-launcher3-master @ build 6294827" am: 61cbcf3176 am: f5dd83bc43

Change-Id: Ib0175cf0983d18d0c266cf2f5d6a042829d30242