hot fix: better moving experiece for mobile
Sync with master