Merge branch 'ub-launcher3-master' into pi-dev am: 3f7df53dda
am: cca5cd0275

Change-Id: I3b7f4fcabcd2300fa2a5a9e4f9caea9341935913