Merge changes I0ab00c03,Ib4e83e36,I72b17568,If4ea3575,If63bf25f, ... into ub-launcher3-qt-dev
am: 61aa79903c

Change-Id: Ie16ecd60c62418adf7d0aff7fadab1f573d54ef2