Merge "Ignore geometry parent when !useTasksDimOnly" into main