Merge "Folder name should follow folder icon text color Bug: 134674880" into ub-launcher3-qt-dev
am: c11ea4e965

Change-Id: Ifa061aa75dd46f42b8b47c7825cbd696d84c77fb