Merge "Allowing state logic to progress from terminal states on touch down." into main