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

Change-Id: Ibeb348bb3d643debf43b38f27b880c837f448789