Merge "folderChild icon and text size should follow the respective configuration" into tm-qpr-dev