Merge "Prevent frozenBinderTransactionDetected() storm" into main