Merge "Remove unnecessary Q SDK check" into main