Merge branch 'ub-launcher3-edmonton-polish' into pi-dev am: 0fd1472b94
am: eb3e99bd11

Change-Id: I8c97047d7c0946053441514c56ca8de7927d9044