refactor: TaskLayout
& QueryLayout
renames
#2613
Merged
TaskLayout
& QueryLayout
renames
#2613