Merge changes I33da0d7f,I36c31609 into ub-launcher3-calgary
am: c42087e5c0

Change-Id: Ic169d18dab27357283b16dd1d705821052874b38