Merging from ub-launcher3-rvc-dev @ build 6436292 am: 82902c0da6

Change-Id: I355c3c3f087518ea108533a91de5b15622f28bf0