Fix General UI force closes for some devices