Merge "Update KQS task view layouts to new specs" into main