merge ongoing efforts to stabilize app on Android