Merge "Make InitController complain about adding tasks that will never execute"