Merge branch 'ub-launcher3-master' into pi-dev
am: 3f7df53dda

Change-Id: If1eb41bde64a06e0a9fd1e469f7afe1d16d6ea71