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

Change-Id: I1e3c2415c144148752cc95b0d2afd31452fc219a