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

Change-Id: Ic71be974c7950fdc481f12761a46185ceaf3734f