Merge branch 'ub-launcher3-edmonton-polish' into pi-dev
am: 1748c4ad61

Change-Id: I1de19c48f5e884742c8f010530519dc0f0593f2c