Merge "Update folder row and column for 5x5 grid to 4x4. Update dump method to...

Merge "Update folder row and column for 5x5 grid to 4x4. Update dump method to include changed properties and add dump test for 5x5 grid" into tm-qpr-dev