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

Change-Id: Ic3963a7fc2226d671bc700370fff6be6bde7e3e0