Merge "Task snapshot surface needs to inherit new flags"