no-flexbox fallbacks fix for tablet
Merge branch 'feature'