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

Change-Id: Iac01f216278cd638f267261f1a7fdbb441620598