Merge changes Id401f273,I0b21c8ea,Ieb7936bd into ub-launcher3-qt-dev
am: 384a0aade0

Change-Id: Id250130cd3f1b2b563556cbd76603f6cf8d2015a