Fix android bug with activity recreation