Merge "Fix hang in native bitmap recycling due to nested mutex locks"