Merge branch 'ub-launcher3-master' into pi-dev
am: 6303a794df

Change-Id: I66f6a79666134e1d8398ea5d726ba45ae184ce49