Merge "Fix QSB alignment" into tm-qpr-dev