Merging from ub-launcher3-rvc-dev @ build 6492476 am: 6e0d05fc41

Change-Id: I831ea10a2a90a4714920a0fd765f4ce3d10761aa