Merge "[DO NOT MERGE] Folder name suggest Bug: 142498588" into ub-launcher3-master