Merge "Add OnNetworkActive to TaskManager and simplify locking." into lmp-preview-dev