Merge "Destroy activity/view references to avoid memory leak" into sc-v2-dev