Adding a null check. The way we're doing this is already a little shady - still doesn't work well with the same names.
Merge branch 'fix-edit-task-with-new-task-open' into dev-gradle