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

Change-Id: I7d3c8d81e2573461260183910fb0a776aa99470b