Merging ub-launcher3-qt-r1-dev, build 5782058 am: c128131a10 am: 103974c88f
am: a938be7c06

Change-Id: I1b0967a7cbf3000d55f09744b51b7e8009cf1323