Fixed possible deadlock with port mapping
Merge branch 'dev'
Fixes for Android
Merge branch 'dev'