Revert^2 "Merging from ub-launcher3-master @ build 6294827" am: 229ab4a79b am: 1b191667eb am: 5aeaee79bd

Change-Id: I2b7c5009d1ff9316ce093500322f8723647ce02a