Bumpless, smooth transfer between two control modes