Revert "Remove handler on each step of view change"

This reverts commit a4eb8b1f523c28745dc4a2199094fbb5deabdede.