Merge branch 'ub-launcher3-edmonton' into pi-dev
am: aea65680e6

Change-Id: Ifba0b867fb58a5f8e8001710ccb0a7ac651c535d