Revert "Merging from ub-launcher3-master @ build 6294827" am: 61cbcf3176

Change-Id: I26c219617c5bb926b14e88abde09bbfb6f51b43f