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

Change-Id: I12941d2ea3c40055a108d082d2379e31bd7ca6e4