Merge "Revert^2 "Merging from ub-launcher3-master @ build 6294827"" into rvc-dev am: 5bee1f934b am: f093861f47

Change-Id: I2c97057dca584ad44138e481d81e939b38502f79