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

Change-Id: I6ef016a92f772bf74b85c7eec84110269adf83ea