Merging from ub-launcher3-master @ build 6248758 am: 3210c06687 am: 9df3490fee

Change-Id: I0d231f9992647c707e23e63a4a3093c9e72bad49