Merging from ub-launcher3-master @ build 6248758 am: 3210c06687 am: 20aaa198f3 am: eaba9530c9

Change-Id: I8f868910c84e62ab70a70fb2f5f676787198d9d9