fixed crash from backing out of log activity
Merge remote-tracking branch 'upstream/master'