Merge "Extract QSFragment logic" into main