[automerger skipped] Merge "[DO NOT MERGE] Folder name suggest Bug: 142498588" into ub-launcher3-qt-future-dev
am: 00105625f4 -s ours
am skip reason: subject contains skip directive

Change-Id: I1efb5617f609e5e1b5943d8ff4d7237585844498