Merge "Make inline qsb part of grid attrs" into tm-dev