Yes, that's absolutely correct. Any initial benefit for service-related or non-service-related disability benefit is up to 24 months, and they will continue to age 65 if the person is totally disabled and incapable of engaging in either vocational rehabilitation or of returning to work.
On April 2nd, 2015. See this statement in context.