Merge "Cleanup qs flag for CommandQueue" into main