mobile switcher fix
Merge branch 'mobile' into dev