Fixed view pause/play
Merge branch 'pauseFix'