Merge branch 'ub-launcher3-edmonton-polish' into pi-dev
am: 170be9beb0

Change-Id: I887337a41ddf77e4cc4ff5df25f0f9cada10553c