Merge "Improve spaces for folders" into tm-qpr-dev