Bug fix mobile view
Merge branch 'release/v2.0.22'