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

Change-Id: I9a2c0cb3ca78a62f90ffe13076b63785f255a882