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

Change-Id: Ia508a5925dafc4cb15fdee11d4426f1726ceb8e4