[TASK] ADWD-1381 map doesn't jump when reset button shows up
Merge branch 'ADWD-1381' into develop