Fixed issue with feed scrolling caused by serialization.
Merge branch 'Fix_FeedScrolling' into aws_production