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

Change-Id: I5d1f634f57dd47d95c2dc6512d285c4b72f28fb0