Merge "Merging from ub-launcher3-master @ build 6304996" into rvc-dev am: c83758f223 am: 69ebef4c4a am: 961225bbc3 am: 4058c3fa63

Change-Id: Ib84bc58876b8c37bffad7938f9e02a380182344f