Merging ub-launcher3-qt-dev, build 5633311 am: a3ed49d566
am: a97ce0ce9c

Change-Id: I29556c4112c3c324b3996f5e36786cdbf78fd203