Merge branch 'ub-launcher3-master' into 'pi-dev'
am: 2fae99f9b3

Change-Id: I6b56e01904b9b21ba9966343b731dda8b0744958