Merging from ub-launcher3-qt-future-dev @ build 6073465

Test: manual, presubmit on the source branch
http://x20/teams/android-launcher/merge/ub-launcher3-qt-future-dev_6073465.html

Change-Id: Id227106ea68a7f1a5594c4f19319ba7a24c8067a
Merged-In: Iefe48be1562428d98ebf08c5f68a01856dbefad2