Merge "Merging from ub-launcher3-master @ build 6327709" into rvc-dev am: ace493908c am: 6b840d55fc am: 2e880d606a am: 8efabe774d

Change-Id: I3d50499998ecc213101e4288189b038d0c3242c4