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

Change-Id: Ib3e4a8a65875a76ba0f772619f44130f94dc4dad