Merge "Fix ActivityLeak through text reference" into main