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

Change-Id: Ie09ee184f914c7e58883a1a5075d6a3ccb3133c9