Merge "Improving folder icon drawable" into tm-dev