Fix tablet switch mode from coming too early
Merge pull request #1916 from geoadmin/fix_tablet_switch

Fix tablet switch mode from coming too early