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

Change-Id: I70df8088b66bcfa0085cfe51e244ed22cd83fecb