Merge branch 'hotfix/fix-feed-and-default-layout'
fix default layout.
Merge branch 'hotfix/fix-default-layout' into develop