Re-enable viewpager scroll lock, fix scroll-to-unread.

Just some minor fixes since the last pull-request.