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

Change-Id: I76566d246ac7e57d8630268f668aea9d116f1e99