Merging ub-launcher3-qt-r1-dev, build 5759495
am: 0305b8b0be

Change-Id: I071297120cb87fdf8eff5a2153f47de3061a2e6e