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

Change-Id: Ibb27ebd567e4c82f7be0b2f5777fb8bd1e8ae88c