Merge "Fix qs rows count on foldables" into tm-qpr-dev