Merge "[DO NOT MERGE] Merge commit '735d1fe124812fd11feabc644c9a4f8482039f57' into manual_merge_735d1fe124812fd11feabc644c9a4f8482039f57" into ub-launcher3-qt-future-dev