Merge "Fix issues around process teardown after full-data restore" into mnc-dev