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

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

Change-Id: I74059dbc75a8530884f8b4f67917b83c75f32d14
Merged-In: Ieee38cc301364f96cf252b2387142b0aa1b75317