Merging from ub-launcher3-master @ build 6304996 am: 58be046dff

Change-Id: I9254cb34d49bad0f773466522b054447bc3916fb