Merging from ub-launcher3-rvc-dev @ build 6469858 am: fe68c9eec1 am: dab51b766e am: 36c83f49c7

Change-Id: I140770c6f6b549eae9fe93379896bca984aa5f8b