[automerger skipped] Merging from ub-launcher3-qt-future-dev @ build 6073465 am: af431d130c am: 77d3127f5c -s ours
am skip reason: Change-Id Iefe48be1562428d98ebf08c5f68a01856dbefad2 with SHA-1 54334661e4 is in history

Change-Id: Ia985d0cf4e1def66c21056968d2926479e6f07fc