MergeActivityWizard: Use index for last point
Merge pull request #684 from jjofre/master

Work around to ensure controller key presses aren't missed.