Merge branch 'ub-launcher3-edmonton' into pi-dev am: d00202ed33
am: 907ef46bcd

Change-Id: Ic53b2379d19444d941a0ae28244ec7d4d2a02339