Merge "Fix problem with clearing root activity during task reset"