Merge branch 'ub-launcher3-master' into pi-dev am: 6303a794df
am: 3b16baa71e

Change-Id: I1d47b5078229c59a4ff183fbb6f51082d87a1079