May fix #2386. If so, thanks to @cyplo who provided the logcat output which directed me to that code path.