Merge "Remove dependency of the QSComposeFragment flag" into main