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

Change-Id: I0045b21f32996c78ded56f0afb64029d62c3a127