Merge "Only count uncleared ProxyMap refs when deciding to crash"