Merge "Merging from ub-launcher3-master @ build 6327709" into rvc-dev am: ace493908c am: 8729067823 am: 98f2612a59

Change-Id: If7e04d10b94104339c30c6ef3de0d6ffc455fceb