Merging ub-launcher3-qt-r1-dev, build 5800211
am: 26bf127983

Change-Id: I0382183c7b4acab935dba6877c3879d50d2d0193