Merging ub-launcher3-qt-dev, build 5691374 am: 5cd4333b5c am: 11cacbe1ab
am: 5d0540874d

Change-Id: I2a2822708971432b279d75927427813ffc9405db