Merge branch 'dev' into brendan/message-timeline-scroll-virtualiser