Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'