Revert^2 "Merging from ub-launcher3-master @ build 6294827" am: 229ab4a79b am: f73cc879d3

Change-Id: Ic9024f3dbd75add8d6aa836dd7b22545304560b7