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

Change-Id: I40aea77f9debdc9d2e9b31da800d59c95d4d4e6e