Merge "Revert "Making tablet grid scalable and tuning size"" into tm-dev