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

Change-Id: Ic6a96cb2a160bf43577e8345835604f2e28602cc