Merge "Merging from ub-launcher3-master @ build 6304996" into rvc-dev am: c83758f223 am: cd41f278a6 am: e96948df6d am: 46a0fe6cf1

Change-Id: Ie4f25d5aec5b47a7ad36d6fd118957ca120da935