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

Change-Id: I570e7202ef7601a0241e17b785c9823246b9ad51