[Shomium-android, Picker thread] Roll back to fix Picker dialog