More cleanup for issue #207 in Transition controller, also updates to swapViewTestApp.