Fixed scrolling on viewWillAppear.
Merge branch 'feature/proper-scroll' into develop