Merge "Update KQS to better support desktop tasks" into main