Merge "Revert "Use a weakreference to prevent the static variable from holding an Activity." Bug was fixed in a different way."