Merge "Merging from ub-launcher3-master @ build 6327709" into rvc-dev am: ace493908c am: 8729067823 am: 303ff51c2b am: 0edac69f36

Change-Id: Ic32a783e3ddc9fe45b9b769008aed29cf9856f8a