Updated ios transitions.
Fixed merge error.