Fix regression in stream display switching to flexbox
Merge branch 'master' into staging