Fix merge error in Android
Try to make distance spinner appear. No luck