Merge "Change folder text color to match spec" into tm-qpr-dev