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

Change-Id: I41d127c91bbe64bbb7640f057669317a023b5f0e