Revert^2 "Merging from ub-launcher3-master @ build 6294827"

61cbcf3176c7aff4728d09050a5344031afb238d
Bug: 151611270
Change-Id: Ifb26e52b91760395925ed9496664016f006c1f66
9 files changed