Merging from ub-launcher3-master @ build 6369897 am: 884f8f217f am: d3ba747e6d am: d5e144463f am: 9c777f6495

Change-Id: Ia39171234a377424be9e80fc8c76643768794075