Corrected crashes when changing orientation and when attaching surface view
1h