Fix activity recreation related crashing