Merge "fix potential leak of Activities"