Revert "Merge branch 'ub-launcher3-master' into pi-dev"
am: 6cf6dd8bce

Change-Id: I550ecf7fe4814661a61716d5f7824fa16ed79b86