Fix transition problem when two transitions are done quickly.

Update Transition controller to remove code causing a problem if two transitions were done very quickly. Also a few more places where view controller was being set to none