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

Change-Id: I546f1e9b8a41009dac64bf51e11052af1217b4ab