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

Change-Id: I25fad873e05391b8484080a4f9c098b026cc184c