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

Change-Id: I04de056a42b86e74c568d8d5405f6f2895d8ac2b