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

Change-Id: I83a62783f021122d04ca676b94b1b7c86ab4f101