Merging from ub-launcher3-rvc-dev @ build 6418896 am: df280add9e

Change-Id: I34e5fec8d640196da56059340f59b10747b05a16