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

Change-Id: I20727114453df8f69942c34e54be591df6ae6aff