Merge "Revert "Merging from ub-launcher3-master @ build 6294827"" into rvc-dev am: f7871fdb54 am: dc65170977 am: 7ba0287942 am: 4ed7e62ae6 am: d00b0ddcd2

Change-Id: I9657f932f38bce6fd4aeb4fce84081188c7d49b4