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

Change-Id: I4cbf6c66a461830182e01766782dcdf7feb27f3b