Merge "Update Activity lifecycle documentation"