Merge "Fix height of QQS so it's wrap content" into main