Merge "Catch IllegalArgumentException from startActivityFromRecents."